-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Indicator when a candy upgrade is available #1083
Merged
brain-frog
merged 35 commits into
pagefaultgames:main
from
josericardo-fo:candy-upgrade
May 28, 2024
Merged
Indicator when a candy upgrade is available #1083
brain-frog
merged 35 commits into
pagefaultgames:main
from
josericardo-fo:candy-upgrade
May 28, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CodeTappert
reviewed
May 18, 2024
CodeTappert
reviewed
May 18, 2024
Finished. Waiting for review. |
CodeTappert
reviewed
May 18, 2024
CodeTappert
reviewed
May 18, 2024
CodeTappert
reviewed
May 18, 2024
…erogue into candy-upgrade
LGTM although the one line comments might be a little excessive. E.g. you could change 'on mode' 'off mode' etc. to a single line comment above or further above clarifying which mode is what, a decent amount of that code is pretty clear in what it does so comments aren't necessary for those cases imo. |
candy.passive.mp4candy.all.mp4animation.passive.mp4animation.all.mp4 |
@Molker Ready for review |
brain-frog
reviewed
May 28, 2024
brain-frog
approved these changes
May 28, 2024
Korwai
pushed a commit
to Korwai/pokerogue
that referenced
this pull request
Jun 14, 2024
* initial implementation * updated logic * reverse retTint * added candy overlays and colors * added settings and minor fixes * german changes * logic fix * german changes pt2 * german changes pt3 * setting name changed * Update battle-scene.ts * initial animation implementation * minor fixes * main compatibility * minor fix * logic for animations * eslint fixes * final generation logic * Pause Animation when Selected or Purchased * Disable Indicator if not Root Species * Add to Reload and Add Anchor * Fix Animation on Change * Fix Icon on Change * Code Cleanup * fix --------- Co-authored-by: Benjamin Odom <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds a candy indicator when a passive/cost reduction upgrade can be purchased.
Also addds the setting Candy Upgrade Icon with three options ('Off' by default):
'No' doesn't show icons, 'Passives Only' only shows icons when you have enough candies to unlock that Pokémon's Passive Ability and 'On' shows icons when you have enough candies to unlock its Passive or Reduce its cost.
Examples: 'Off' and everything has enough candies
'Passives Only' and the last row had their passives unlocked (since Snorlax has Munchlax as its baby, the icon still appears if you can unlock its baby Passive)
'Passives Only', the last row had their passives unlocked, the first row has their costs reduced twice and the second row had their costs reduced once and the third row has everything unlocked
The icons also update themselves when you buy something
Purchasing Tests